Allow jetpacks to fit in the suit storage slot #2400
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
size/XS
github-actions
bot
added
size/L
|
RSI Diff Bot; head commit 3dc615a merging into 53ebfe8 Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi
Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi
Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi
|
|
Direction review in progress. One item we might request is that the Captain's jetpack be increased in capacity, such that it is still a "worthy" steal target. We will have a full answer in a day. |
|
Alternatively you could make the captain’s jetpack faster but keep the same capacity. Personally I’d recommend increasing the void jetpack capacity since it’s the RE version of the normal jetpack. But as long as there is some way for the captain’s jetpack to be important in some way, I’m for it. |
|
Direction Approved, we would like to see the Captain+ Void Jetpack differentiated in some capacity in the future, but that doesnt stop this PR. |
deltanedas
approved these changes
Dec 12, 2024
GeneralGaws
added a commit
to EndrAnimet/DeltaV-Stray
that referenced
this pull request
Dec 17, 2024
* Automatic changelog update * babyproof arrivals shuttle (#33284) * babyproof arrivals shuttle * always powered lights * uncuttable cables from terminal PR. --------- Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * Add delay to AutoOrient (#33479) It functions identically to how V1 of orientation worked and it's incredibly annoying. * Automatic changelog update * Draw muzzle flash below mobs (#33465) * Draw muzzle flash below mobs * Better naming --------- Co-authored-by: Winkarst <[email protected]> * Automatic changelog update * Allow shuttles on planets to make FTL jump (#33507) This check conflicts with an attempt to FTL from the planet before expedition ends * Automatic changelog update * fix exped caves generation (#32890) Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * various material & ore inhands (#33342) * begin * bones + pyrotten + goliath hide inhands * Update Resources/Prototypes/Entities/Objects/Materials/materials.yml Co-authored-by: slarticodefast <[email protected]> * Update Resources/Textures/Objects/Materials/materials.rsi/meta.json Co-authored-by: slarticodefast <[email protected]> * Update Resources/Textures/Objects/Materials/materials.rsi/meta.json Co-authored-by: slarticodefast <[email protected]> * Update Resources/Textures/Objects/Materials/materials.rsi/meta.json Co-authored-by: slarticodefast <[email protected]> * pyrottOn --------- Co-authored-by: slarticodefast <[email protected]> * Delete HOS headset from warden's locker (#33234) * add headset * Add icons * Meta change * fix * Revert + delete headset from locker * fix airlocks inconsistently auto-closing after unbolting (#33524) fix door auto close timer * Automatic changelog update * [BUGFIX] "Ghost" in the lobby lets you see the whole chat (#33529) * fix bug, in ghost command lobby * fix * Fix build * removed obsolete netmessage creator (#33542) removed opsolete netmessage createor * Fix RA0003 warning for ChatBox (#33531) * Shark plushies now goes rawr on hit. (#33540) Shark goes rawr more * Automatic changelog update * Turn off PointLights on VendingMachines when broken or off. (#33513) The light itself should already turn off due to `LitOnPowered` component, but the broken state of a VendingMachine did not. Fixes #33382 * Automatic changelog update * Adds more diona names (#33066) * adds more diona names * more stuff * AHHHHHHHHHHHHHHHHHHHHHHH * further additions * removes depression + adds comment * fixes + remove some weird stuff + more stuff * remove haste * minor AI cleanup (#33555) * minor cleanup * to * Simplify separated screen top menu (#33047) * Automatic changelog update * Ghost role drop-down alignment (#33397) * dropdown shares margin width with children * removed dependency that rider added for some reason * reduced vertical margin from 8 to 2 * Greytide Virus station event (#33547) * proof of concept * full implementation * I commited a crime * t * min players increase * Make shuttle airlocks not snapcardinals (#33557) * Make shuttle airlocks not snapcardinals * Update Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml Co-authored-by: slarticodefast <[email protected]> * Update Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml Co-authored-by: slarticodefast <[email protected]> --------- Co-authored-by: Winkarst <[email protected]> Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * Fix space ambient music (#33594) * Automatic changelog update * Fix windoor and high security door not showing electrocution HUD (#33551) * Automatic changelog update * Removes burnt tiles (#33422) remove burnt tiles * Added Oppenhopper poster to the game. (#33588) * o7 * - * oppenhopper v2 * Update Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml * Update Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml --------- Co-authored-by: slarticodefast <[email protected]> * Fix version for electril_grill meta.json (#33611) fix fixing the version thing in meta json for electril grill textures Co-authored-by: Arthur Kustenko <[email protected]> * Fix gauze eyepatch flying pixel (#33564) boo * Fix swapped uniform printer east/west sprites (#33442) Fix uniform printer sprites rotating the wrong way * Makes knives fly straight when thrown (#33615) Gives knives a thrown angle * Light verb is now predicted (#33622) Fix * Automatic changelog update * Update `Content.PatreonParser` to use `net8.0` `TargetFramework` (#33559) Update Content.PatreonParse to use net8.0 targetframework * Fix gender, maybe (#33631) Co-authored-by: Alpha-Two <[email protected]> * Display GPS coordinates on their own line (#33625) * Automatic changelog update * Add admin log for ghost warping (#33636) * Automatic changelog update * Rename nitrogen internals crate (#33545) * rename nitrogen internals crate * nitrogen internals crate description * migrate CrateNitrogenInternals ID * Automatic changelog update * Cleanup some Client atmos systems (#33634) * Cleanup `ScrubberControl.xaml.cs` * Minor cleanups * Another pile of minor cleanups * Apply requested changes * Rename "which" into "bound". Add whitespace after "if" * Fix for arrivals deleting nuke (#33659) Adds FTLSmashImmune to nuke prototype to stop it from arrival smashing Adds a comment in FasterThanLight to indicate where the FTLSmashImmuneComponent is checked Co-authored-by: aa5g21 <[email protected]> * Automatic changelog update * add locale to Shuttle Console Map tab (#33651) fixed * Automatic changelog update * fix PermanentBlindnessComponent to be not so permanent (#33292) * adjust min blindness back to 0 when PermanentBlindnessComponent is removed * mapinit changes * remove OnRemove, move changes to OnShutdown * goodbye event * dependency removal * final adjustment --------- Co-authored-by: lunarcomets <luanrcomets2@gmail,com> * Automatic changelog update * Fix for handcuffing someone more than once (#33646) * Fix for over-cuffing someone * comment * Automatic changelog update * Fix for inspecting entities in hand (#33642) Actually inspect entity in hands * Automatic changelog update * Fix for inspecting entities in the stripping window (#33644) Handle it * Automatic changelog update * Fix borgs not getting names on roundstart (#33578) * Fix borgs not getting names on roundstart * Glory to the NT * Allow riggable to take in multiple reagents * Revert --------- Co-authored-by: Winkarst <[email protected]> * Automatic changelog update * Require Wield To Activate Double-bladed ESword (#32869) * Add MeleeRequiresWield component * Prevent world activation * Automatic changelog update * Fix makeghostroleraffle command where 4 arguments (#31836) Fix makeghostroleraffle command with 4 arguments * Automatic changelog update * this isnt needed anymore * Fix formatting IDE0055 warnings in VS Code (#33669) * Replace obsolete GetTilesIntersecting methods (#32455) * Remove usage of obsolete GetTilesIntersecting round 1 * Oop wrong uids * Remove usage of obsolete GetLocalTilesIntersecting round 2 * Remove usage of obsolete GetLocalTilesIntersecting final round * weh * Fix using `SharedMapSystem` in `StencilOverlay` * Automatic changelog update * Fix wrong system usage (#33679) Fix wrong system using * Fix BuckleSystem always marking InteractHandEvent as Handled (#33602) * Add check before marking event as handled * Update Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs Co-authored-by: slarticodefast <[email protected]> * Cleanup --------- Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * Fixed ghost role rules for some syndicate familiars (#32457) * fix ghost role rules for some syndicate familiars * change from monkey rules to Team Antag rules. * Resolve reviews + Fix rules for LoneOp and Xenos * ghostrole rules --------- Co-authored-by: JIPDawg <[email protected]> Co-authored-by: Errant <[email protected]> * Automatic changelog update * Fix lobby countdown not showing hours (#33685) * Automatic changelog update * Makes kukri not use combat knife's storage sprite (#33661) * Adds a morgue locked maints airlock (#33693) Co-authored-by: Velcroboy <[email protected]> * Juiceable slimeballs (#33660) adds extractable component to slimeball prototype * Add missing nacho recipes (#33637) * Nacho recipes, nutrition, and trash In meal_recipes.yml: Add recipes for Nachos, Cheesy Nachos, and Cuban Nachos. In meals.yml: Add a solutions container to regular nachos so it lines up with the others, and add a small plate as trash to each one. * Volumes, nutritional tweaks, and flavor In meals.yml: Lowered maxVol on nachos to leave 5 units of space. Nachos nutriment and vitamin lowered for costing so little. A cheese wedge is 3.75 nutriment, so cheesy having 4 more total nutritional value lines up nicely to me. Cuban nachos had too little volume to fit its reagents in the first place, so increased maxVol by 10. Chili peppers are 4 nutri / 4 vitamin and ketchup has a touch of tomato, so bumped to 8 and 5. Capsaicin lowered partly to make it an even 20u. Ketchup dilutes I guess. Also they don't have cheese so I changed the flavor profile to tomato instead. In meal_recipes.yml: Cuban Nachos recipe tweaked to require one less pepper. Given above numbers, this fits the nutritional value imo. * Automatic changelog update * Fix sinks and toilets not draining (#33691) * Fix AutoDrain Per the system comments, AutoDrain is designed to automatically move puddles into the drain (like a floor drain). Drains without AutoDrain are still supposed to gradually empty the buffer, but not remove puddles (like sinks and toilets). However, a logic error in the original implementation causes drains with AutoDrain set to false to simply not work. Hence sinks never emptied. * Update documentation * Automatic changelog update * Fix layout on wires UI (#33714) Layout would break for machines with >6 lights because the column count was hardcoded. Uncap the UI width and fix the rows count instead. Lights with less than 4 characters of text weren't aligned right, now they are. * Automatic changelog update * Fix for towels not having a cooldown for cleaning (#33700) Added a delay to cleaning with the towel * Add cooldown to buttons in borg's laws UI (#31490) * Adds Store on Collide and Wand of the Locker (#33710) * Adds wand of locker and locker projectile * Adds IsOpen method to check if storage is open * Adds store on collide * Adds Store On Collide to Wizard Locker * Adds Lock API * Adds locking support * Adds resist override and custom visual layers * Fixes decursed states, adds comment for a future visualizer * adds locker wand visuals and descriptions * shrinks locker radius, moves TODO for throw support * Adds whitelist and moves storage and lock logic into their own methods * Adds support to disable store on collide after the first open. Fixes prediction issues with disabling. * Adds wand of locker to the grimoire * Adds wizard access prototype * Adds Wizard to universal access * Moves Lock on collide to on collide method * Comments * Changes layer order * Fixes prediction issues when locking. * Adds Wiz access to universal ID * Automatic changelog update * More device configurator serialization fixes (#33664) More device configurator invalid entity serialization fixes * Fix meteor's ArithmeticException (#33556) Co-authored-by: Winkarst <[email protected]> * Give vox health regen for poison below 20 damage (#33722) * Automatic changelog update * set n2 survival box sprite layers (#33733) * Automatic changelog update * fix a station event weighting bug (#33584) * fractional weights dont work in StationEvents * force-int * sure why not, we can keep floats I guess. * Automatic changelog update * Adds Station Anchor Beacon (#33711) Co-authored-by: Velcroboy <[email protected]> * Fix name duplications (#33740) * Fix name duplication * Apply requested changes * Add a maintenance panel to bar signs (#33467) * Add a maintenance panel to bar signs * Update Resources/Locale/en-US/wires/wire-names.ftl * AI interactions --------- Co-authored-by: Winkarst <[email protected]> Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * Derelict Borg Revival (#33433) * Derelictn'tn't Borg! * Clean *sparkles* * Removed "S: Awaiting Changes" * Automatic changelog update * vox guidebook update poison regen (#33739) * vox guidebook regen update * damage number * skreee * Revert "fix debris having nothing (DeltaV-Station#2280)" This reverts commit 3a27784. * Fix debris chunks loot spawning (#33747) Update DungeonJob.PostGenBiome.cs * Automatic changelog update * Added several variables to make ClumsyComponent more modular for developers. (#33715) Co-authored-by: slarticodefast <[email protected]> * Add Sprite changes to Logic Gates to show the input/output state (#33277) * Samurai dogi is now major contraband (#33699) * snake_case to PascalCase for name datasets * clean up random lathe recipes (#31525) Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: slarticodefast <[email protected]> * Make unknown shuttle events trigger an announcement (#33450) * Make unknown shuttle events trigger an announcement * Call base at the end --------- Co-authored-by: Winkarst <[email protected]> * Predicted gas pumps (#33717) * Predicted gas pumps I wanted to try out atmos and first thing I found. * a * Remove details range * Automatic changelog update * Christmas Nuke Song (#33752) * 圣诞歌曲 * Update Resources/Audio/StationEvents/attributions.yml Co-authored-by: slarticodefast <[email protected]> --------- Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * infiltrator update (#33759) * Organize the Sandbox Panel window (#33684) * Organize Sandbox Panel * Map Editing -> Editing * Unset ToggleMode on Suicide button. Can hardly un-suicide, no? * Remove 'Link machines' button that has done nothing for 3 years * Remember Sandbox window's position instead of forcing to center * Shows Spawns -> Show Spawns * Remove SandboxSystem.MachineLinking * Grey & Wooden Railings (DeltaV-Station#2379) * initial commit * double parent * will this work... * fine. * abstract & suffix & newline *Signed-off-by: deltanedas <[email protected]> --------- Signed-off-by: deltanedas <[email protected]> Co-authored-by: deltanedas <[email protected]> * Automatic changelog update * Add Reinforced Directional Tinted Window (DeltaV-Station#2376) * initial commit * oops * Update tinted_windows.yml * Automatic changelog update * Update Credits (DeltaV-Station#2392) Co-authored-by: DeltaV-Bot <[email protected]> * change up and add ninja objectives (DeltaV-Station#2359) * change up and add ninja objectives * make cloak stealable * formatting --------- Co-authored-by: deltanedas <@deltanedas:kde.org> * Automatic changelog update * Randomizes the appearance of Fugitives (DeltaV-Station#2383) * Adds RandomHumanoidAppearance to both and does not randomize their names * LPO is now back to being clones of station members * Automatic changelog update * Build Diona Different (DeltaV-Station#2204) * meow * meow * meow * meow * meow * Automatic changelog update * aac tablet refactor (DeltaV-Station#2401) * another thing nobody asked for * just.. why? who did this, and why? * Derotates Micro (DeltaV-Station#2402) Update default.yml * Automatic changelog update * Automatic ACO procedure (DeltaV-Station#2351) * Add events for player updating jobs * Add NoCaptainComponent * add and remove NoCaptainComponent logic * Gernalized to CaptainStateComponent * Generalized CaptainStateComponent * Add requesting aco vote * Add auto unlock aa * Remove hardcodecd strings * Add localization * // DeltaV * pro fix * fax cc please * move captain detection to CaptainStateSystem * track spareidsafe with comp instead * little bit of movement * fix broken formating Signed-off-by: SolStar <[email protected]> * pls * Remove unused method * subscribe captainstatecomponent for job events * Cvars, Disabled AA on peri * temp fix for intergration test bug * :3 * format fix * spelling ops * nameing ops * done final real this time (1) (1) * remove has an out very nice --------- Signed-off-by: SolStar <[email protected]> * Automatic changelog update * make lathe items worthless (DeltaV-Station#2406) * shutting down the money printer * fix ore processor * Automatic changelog update * Update CODEOWNERS (DeltaV-Station#2403) * fix diona speed (DeltaV-Station#2413) i swear this fucking codebase was designed to hate me * Automatic changelog update * add lavaland real (DeltaV-Station#2380) * fix not being able to make catwalk over lava * add planet prototypes * StationSurface -> StationPlanetSpawner * spawn lavaland for all stations * remove reclaimer wrecks muahaha * add mining shuttle * add lavaland map * convert glacier surface to a grid (still unusable) * update glacier comment * add docking shuttle/console systems * fix test * make glacier use a lavaland base reskin * -m actually set the atmosphere *
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the PR
Title.
Why / Balance
QoL in my opinion, this allows salvage to upgrade to regular jetpacks they find at debris + allows security to be more efficient in space since they don't have to be carrying around the jetpack in hand just to get stranded in space when glimmer storm hits.
If these seems a bit too big of a upgrade I could lower their volume or up the captain's and void ones.
Technical details
YAML changes
Media
Github nukes the video when i upload it. Enjoy the link to it on discord.
https://discord.com/channels/968983104247185448/1206353544186171482/1315738655578525806
Requirements
Breaking changes
Hopefully none.
Changelog
🆑